Auto merge of #1238 - SimonSapin:patch-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 28 Jan 2015 22:33:03 +0000 (22:33 +0000)
committerbors <bors@rust-lang.org>
Wed, 28 Jan 2015 22:33:03 +0000 (22:33 +0000)
commit92a951582b347519e7c8018cb4cb0e302422de40
tree037aa12dfd01c16d30ea5781b4914ff30bf79840
parente20caae6a2e025a9014ee11cd93f1e02728fc251
parentba3adb5a80234f08b3aacf39c55e87dc8d090798
Auto merge of #1238 - SimonSapin:patch-2, r=alexcrichton